Check for mismatch between headers shared by Linux and Xen.

This is only enabled for the linux-2.6-xen tree and is intended to
ensure that the separate Linux tree stays up to date once we
switch away from the sparse tree.

Signed-off-by: Ian Campbell <ian.campbell@xensource.com>

diff --git a/buildconfigs/mk.linux-2.6-native b/buildconfigs/mk.linux-2.6-native
index 09ed18efde09b5fd47e587a71e04254953a2f68c..0541c1319f307eaa7e86e7e34ec64c44cd6d6dba 100644 (file)
--- a/buildconfigs/mk.linux-2.6-native
+++ b/buildconfigs/mk.linux-2.6-native
@@ -1,4 +1,7 @@
 EXTRAVERSION = -native
 IMAGE_TARGET = bzImage
 INSTALL_BOOT_PATH = $(DESTDIR)/boot
+
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
 include buildconfigs/mk.linux-2.6-xen

diff --git a/buildconfigs/mk.linux-2.6-paravirt b/buildconfigs/mk.linux-2.6-paravirt
index 1a0127733e9b5268d49bcec6339016e428a77ca4..4ff8d7b99b41c611d53f8ed3de7ff4d7e96f50e0 100644 (file)
--- a/buildconfigs/mk.linux-2.6-paravirt
+++ b/buildconfigs/mk.linux-2.6-paravirt
@@ -6,6 +6,8 @@ LINUX_VER ?= 2.6-paravirt
 XEN_TARGET_ARCH = x86_32
 IMAGE_TARGET ?= vmlinux bzImage
 
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
 EXTRAVERSION ?=
 
 include buildconfigs/mk.linux-2.6-xen

diff --git a/buildconfigs/mk.linux-2.6-xen b/buildconfigs/mk.linux-2.6-xen
index afd56b13976c702162e68d8a94767b040ba0b9a5..a0e4fa89f1a6a7bc02e40eec5475f7e4aec871df 100644 (file)
--- a/buildconfigs/mk.linux-2.6-xen
+++ b/buildconfigs/mk.linux-2.6-xen
@@ -27,6 +27,15 @@ include buildconfigs/src.$(XEN_LINUX_SOURCE)
 # The real action starts here!
 .PHONY: build
 build: $(LINUX_DIR)/include/linux/autoconf.h
+ifneq ($(XEN_LINUX_ALLOW_INTERFACE_MISMATCH),y)
+       @if ! diff -urN -x '*.size' $(LINUX_SRCDIR)/include/xen/interface xen/include/public ; then \
+               echo "" 1>&2 ; \
+               echo " *** $(LINUX_SRCDIR)/include/xen/interface is out of date " 1>&2 ; \
+               echo " *** relative to $(XEN_ROOT)/xen/include/public." 1>&2 ; \
+               echo "" 1>&2 ; \
+               exit 1 ; \
+       fi
+endif
        if grep "^CONFIG_MODULES=" $(LINUX_DIR)/.config ; then \
            $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) modules ; \
            $(MAKE) -C $(LINUX_DIR) ARCH=$(LINUX_ARCH) INSTALL_MOD_PATH=$(DESTDIR) modules_install ; \

diff --git a/buildconfigs/mk.linux-2.6.5-SLES-xen b/buildconfigs/mk.linux-2.6.5-SLES-xen
index 693e89ca649f30dfd4de98457203f7bdac1a445f..c3733ee55bd4a7f0540c8d4f6e472a3287763c3e 100644 (file)
--- a/buildconfigs/mk.linux-2.6.5-SLES-xen
+++ b/buildconfigs/mk.linux-2.6.5-SLES-xen
@@ -2,6 +2,8 @@
 XEN_TARGET_ARCH = x86_32
 XEN_TARGET_X86_PAE = y
 
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
 EXTRAVERSION = -xen
 LINUX_VER = 2.6.5-SLES
 

diff --git a/buildconfigs/mk.linux-2.6.9-RHEL-xen b/buildconfigs/mk.linux-2.6.9-RHEL-xen
index 9b1a9b87a7629a152f157553cd0124a211e58608..3f6717fe3b7446af92d63038db2eab30a81091c6 100644 (file)
--- a/buildconfigs/mk.linux-2.6.9-RHEL-xen
+++ b/buildconfigs/mk.linux-2.6.9-RHEL-xen
@@ -2,6 +2,8 @@
 XEN_TARGET_ARCH = x86_32
 XEN_TARGET_X86_PAE = y
 
+XEN_LINUX_ALLOW_INTERFACE_MISMATCH := y
+
 EXTRAVERSION = -xen
 LINUX_VER = 2.6.9-RHEL